From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 29 Nov 2017 20:05:45 +0000 (+0000)
Subject: mm/page_alloc: Avoid ABI change in 4.9.65
X-Git-Tag: archive/raspbian/4.9.80-2+rpi1~8^2~11
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=8e8ac718ef79c54d643f376e4d7afd418821be0d;p=linux-4.9.git

mm/page_alloc: Avoid ABI change in 4.9.65

Commit d135e5750205 "mm/page_alloc.c: broken deferred calculation"
renamed pglist_data::static_init_size to static_init_pgcnt.  However
the field has the same semantics as were intended originally (and in
any case, the field is only used by built-in code).  Hide the renaming
from genksyms.


Gbp-Pq: Topic debian
Gbp-Pq: Name mm-page_alloc-avoid-abi-change-in-4.9.65.patch
---

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index e3d7754f25f0..65a686a7bf34 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -676,7 +676,11 @@ typedef struct pglist_data {
 	 */
 	unsigned long first_deferred_pfn;
 	/* Number of non-deferred pages */
+#ifndef __GENKSYMS__
 	unsigned long static_init_pgcnt;
+#else
+	unsigned long static_init_size;
+#endif
 #endif /* CONFIG_DEFERRED_STRUCT_PAGE_INIT */
 
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE